Skip to content
This repository was archived by the owner on Jan 15, 2026. It is now read-only.

Various updates.#5

Merged
kennytm merged 4 commits intorust-lang:masterfrom
kennytm:etc-updates
Jun 2, 2018
Merged

Various updates.#5
kennytm merged 4 commits intorust-lang:masterfrom
kennytm:etc-updates

Conversation

@kennytm
Copy link
Member

@kennytm kennytm commented May 31, 2018

  1. On merge conflict, shows what is being in conflict, and added some description how to perform a git rebase.
  2. Disallow @bors try after @bors r+ (Fix Disallow calling @bors try after the PR has been r+'ed #3)
  3. Treat [DO NOT MERGE] as the same as [WIP].
  4. Break an RC cycle with weakref.

@kennytm kennytm merged commit 53e210b into rust-lang:master Jun 2, 2018
@kennytm kennytm deleted the etc-updates branch June 2, 2018 09:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant